# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1270584466 18000
# Node ID e1a49db5c6ffbedcb5eb4bef9ea01834baa8b0bd
# Parent  cf3ba8f574342a959aeb7c39e89377fd2c884439
git-next-unmerged-file: also include "both modified" files

diff --git a/.shell.d/50.vcs_functions.sh b/.shell.d/50.vcs_functions.sh
--- a/.shell.d/50.vcs_functions.sh
+++ b/.shell.d/50.vcs_functions.sh
@@ -204,7 +204,7 @@ function vcs_current_branch() {
 }
 
 function git_next_unmerged_file() {
-  git status | grep unmerged | head -n 1 | sed 's/.*:   //'
+  git status | egrep '(unmerged|both modified)' | head -n 1 | sed 's/.*:   //'
 }
 alias git-next-unmerged-file=git_next_unmerged_file